Skip to content

rattler-build#2321

Merged
casperdcl merged 6 commits into
masterfrom
rattler
May 16, 2026
Merged

rattler-build#2321
casperdcl merged 6 commits into
masterfrom
rattler

Conversation

@casperdcl
Copy link
Copy Markdown
Member

@casperdcl casperdcl commented May 7, 2026

Testing

conda install -c conda-forge rattler-build
# build (and test)
rattler-build build --experimental -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi # --no-test

Note

development instructions are unchanged (still just conda install --file requirements-test.yml && pip install --no-deps -e .)

  • debugging: test on windows in this PR branch
    • revert debug commit (so windows is only tested on master/tag as before)

Checklist

  • I have performed a self-review of my code
  • I have added docstrings in line with the guidance in the developer guide
  • I have updated the relevant documentation
  • I have implemented unit tests that cover any new or modified functionality
  • CHANGELOG.md has been updated with any functionality change
  • Request review from all relevant developers
  • Change pull request label to 'Waiting for review'

@casperdcl casperdcl self-assigned this May 7, 2026
@github-project-automation github-project-automation Bot moved this to Todo in CIL work May 7, 2026
@casperdcl casperdcl added this to the v26.0 milestone May 7, 2026
@casperdcl casperdcl changed the title ratter-build rattler-build May 7, 2026
@casperdcl casperdcl force-pushed the rattler branch 17 times, most recently from eab54e7 to d2d2d53 Compare May 7, 2026 19:38
@casperdcl casperdcl marked this pull request as ready for review May 7, 2026 20:00
@casperdcl casperdcl requested a review from a team as a code owner May 7, 2026 20:01
@casperdcl casperdcl moved this from Todo to Priority review in CIL work May 7, 2026
@lauramurgatroyd

This comment was marked as duplicate.

@casperdcl casperdcl mentioned this pull request May 8, 2026
2 tasks
@casperdcl

This comment was marked as off-topic.

@lauramurgatroyd
Copy link
Copy Markdown
Member

Hi @casperdcl, should we be concerned about this warning?

image

@lauramurgatroyd
Copy link
Copy Markdown
Member

lauramurgatroyd commented May 8, 2026

I deployed the 'build' workflow to run all tests and got a failure related to astra:
https://github.com/TomographicImaging/CIL/actions/runs/25560910040
I will rerun that test and see what happens

@lauramurgatroyd

This comment was marked as duplicate.

Copy link
Copy Markdown
Member

@lauramurgatroyd lauramurgatroyd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, here are a few things I noticed when I was looking through the code changes

Comment thread .github/workflows/build.yml Outdated
Comment thread .github/workflows/build.yml
Comment thread recipe.yaml
Comment thread recipe.yaml
path: .

build:
number: ${{ build_number }}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be {{ GIT_DESCRIBE_NUMBER }} - is there a reason for the change to 0?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not available in rattler unfortunately; though I just opened prefix-dev/rattler-build#2484 lol 🤞

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the developer meeting we discussed that the latest 'dev' build is number 42. So we should set the build number to 42 or 43

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought @gfardell would delete the dev builds while we wait for the next rattler-build release.

Comment thread recipe.yaml
--test dist/*/cil-* --extra-deps numpy=${{ matrix.numpy-version }}
recipe-path: recipe.yaml
build-args: --experimental -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi --variant python=${{ matrix.python-version }}
artifact-name: conda-py${{ matrix.python-version }}-${{ matrix.os }}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why this is now named 'conda' - it used to be named 'cil'?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. makes it clear that the art[ie]fact is a conda file in the GitHub UI
  2. makes it easy to copy-paste this code to other libraries we maintain without modification

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better to be consistent with the previous naming: https://anaconda.org/channels/ccpi/packages/cil/files

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The conda file names are unchanged. This is just the GitHub art[ie]fact zip name

@lauramurgatroyd

This comment was marked as resolved.

@lauramurgatroyd
Copy link
Copy Markdown
Member

All of the actions are passing at: https://github.com/TomographicImaging/CIL/actions/runs/25727755713

Comment thread .github/workflows/build.yml Outdated
@lauramurgatroyd
Copy link
Copy Markdown
Member

Hi @casperdcl I am happy with everything else - just added a couple of comments

@casperdcl casperdcl merged commit d403a3f into master May 16, 2026
8 checks passed
@casperdcl casperdcl deleted the rattler branch May 16, 2026 10:42
@github-project-automation github-project-automation Bot moved this from Priority review to Done in CIL work May 16, 2026
casperdcl added a commit that referenced this pull request May 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants